Add missing instrumentation in vector::insert - Patch from Anna Zaks This patch was reviewed as D10859. http://reviews.llvm.org/D10859 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@242617 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/vector b/include/vector index c168c8e..049d3c8 100644 --- a/include/vector +++ b/include/vector
@@ -1897,9 +1897,11 @@ pointer __old_last = this->__end_; for (; this->__end_ != this->__end_cap() && __first != __last; ++__first) { + __RAII_IncreaseAnnotator __annotator(*this); __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first); ++this->__end_; + __annotator.__done(); } __split_buffer<value_type, allocator_type&> __v(__a); if (__first != __last) diff --git a/test/std/containers/sequences/vector/asan.pass.cpp b/test/libcxx/containers/sequences/vector/asan.pass.cpp similarity index 75% rename from test/std/containers/sequences/vector/asan.pass.cpp rename to test/libcxx/containers/sequences/vector/asan.pass.cpp index 86c02b2..0a11147 100644 --- a/test/std/containers/sequences/vector/asan.pass.cpp +++ b/test/libcxx/containers/sequences/vector/asan.pass.cpp
@@ -15,15 +15,18 @@ #include <cassert> #include <cstdlib> -#include "min_allocator.h" #include "asan_testing.h" +#include "min_allocator.h" +#include "test_iterators.h" +#include "test_macros.h" #ifndef _LIBCPP_HAS_NO_ASAN extern "C" void __asan_set_error_exit_code(int); + int main() { -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::vector<T, min_allocator<T>> C; @@ -33,7 +36,18 @@ T foo = c[c.size()]; // bad, but not caught by ASAN } #endif - + + { + typedef input_iterator<int*> MyInputIter; + // Sould not trigger ASan. + std::vector<int> v; + v.reserve(1); + int i[] = {42}; + v.insert(v.begin(), MyInputIter(i), MyInputIter(i + 1)); + assert(v[0] == 42); + assert(is_contiguous_container_asan_correct(v)); + } + __asan_set_error_exit_code(0); { typedef int T; @@ -41,7 +55,7 @@ const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; C c(std::begin(t), std::end(t)); c.reserve(2*c.size()); - assert(is_contiguous_container_asan_correct(c)); + assert(is_contiguous_container_asan_correct(c)); assert(!__sanitizer_verify_contiguous_container ( c.data(), c.data() + 1, c.data() + c.capacity())); T foo = c[c.size()]; // should trigger ASAN assert(false); // if we got here, ASAN didn't trigger diff --git a/test/std/containers/sequences/vector/asan_throw.pass.cpp b/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp similarity index 100% rename from test/std/containers/sequences/vector/asan_throw.pass.cpp rename to test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
